Merge?
authorChristian Limpach <Christian.Limpach@xensource.com>
Thu, 21 Sep 2006 18:34:45 +0000 (19:34 +0100)
committerChristian Limpach <Christian.Limpach@xensource.com>
Thu, 21 Sep 2006 18:34:45 +0000 (19:34 +0100)

Trivial merge